From: Glenn Morris <rgm@gnu.org>
Date: Sat, 7 Nov 2020 17:57:56 +0000 (-0800)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~4436^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1de00441a5cd983ae4d76eecd80286928e791e96;p=emacs.git

; Merge from origin/emacs-27

The following commits were skipped:

0cdd6c9218 Handle Cairo errors in ftcrfont_open
29af10afe8 Backport: Fix exiting the finder-commentary buffer
---

1de00441a5cd983ae4d76eecd80286928e791e96